Merge version 1:11.8.6-2+rpi1 and 1:11.8.6-4 to produce 1:11.8.6-4+rpi1

diff --cc debian/changelog
index 54e7caf6914b72f3fcff8dcd604f62681950f836,42b058808cb6ecb017262cf45d848b21b8ee7eca..7a81b5a75ec37484d1d7b4a7ee752d12b5865ef2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,33 +1,40 @@@
- mariadb (1:11.8.6-2+rpi1) forky-staging; urgency=medium
++mariadb (1:11.8.6-4+rpi1) forky-staging; urgency=medium
 +
++  [changes brought forward from 1:11.8.6-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Mar 2026 22:49:06 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Mar 2026 22:49:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Mar 2026 16:10:20 +0000
++
+ mariadb (1:11.8.6-4) unstable; urgency=medium
+ 
+   * New AppArmor for mariadbd now in 'enforce' mode. See NEWS for details.
+   * Additional refinement to make the AppArmor and related autopkgtest as
+     robust as possible:
+     - Add patch to have mariadb-test-run not write in
+       /usr/share/mariadb/mariadb-test/ to not violate the AppArmor profile
+     - Normalize variables 'aria-checkpoint-interval' and 'aria-recover-options'
+       to documented defaults as they seem to be effect in Ubuntu binaries now,
+       while Debian binaries seem to default to zero and empty for an unknown
+       reason.
+     - Ensure AppArmor diagnostics run even when autopkgtests fail to catch
+       potential situations where autopkgtests job 'upstream' violated the
+       AppArmor profile.
+     - Simplify AppArmor profile, allow 'mariadb' aliases and unify indentation.
+     - Extend AppArmor profile to cover all easily testable features
+       (Closes: #1130272).
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Thu, 19 Mar 2026 13:13:13 +0000
+ 
+ mariadb (1:11.8.6-3) unstable; urgency=medium
+ 
+   * Skip nondeterministic vector tests in mariadb-test-run to avoid sporadic
+     failures that are not signs of any actual regressions
+   * Make autopkgtest emit debug info on service start failures
+   * Fix AppArmor "disconnected path" errors (LP: #2143708) to ensure that
+     systemd notify signals are passed correctly and the MariaDB systemd service
+     won't think the service failed to start and timeout after 15 minutes
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Tue, 10 Mar 2026 23:23:23 +0000
  
  mariadb (1:11.8.6-2) unstable; urgency=medium